oxenstored: Build it

 * Add the relevant build dependencies

     ocaml-native-compilers is good on stretch because it
     will get us better output code.  In buster the
     ocaml-native-compilers package is merged into ocaml-nox.
     In bullseye we can drop ocaml-native-compilers from the list.

 * Drop the rules line that disables the ocaml build.

 * Ship /etc/xen/oxenstored.conf.

 * Placate dh_missing about ocaml development libraries.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
[add trailing comma, fix typo, change bulleseye line]
Signed-off-by: Hans van Kranenburg <hans@knorrie.org>

diff --git a/debian/control b/debian/control
index b7b670cd9cd99e5b8c22626b490be240ed3923f4..72dc3e76de87305fdcfca8e2dfb28cbbf07f974a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,9 @@ Build-Depends:
    uuid-dev,
    zlib1g-dev,
    pandoc,
-   markdown
+   markdown,
+   ocaml-native-compilers | ocaml-nox,
+   ocaml-findlib,
 XS-Python-Version: current
 Homepage: https://xenproject.org/
 Vcs-Browser: https://salsa.debian.org/xen-team/debian-xen

diff --git a/debian/not-installed b/debian/not-installed
index 17a331400e0b9572808dd2ecfca3e33e327072bf..5ffa4475878f8f0010a48e2874a624c8593781cc 100644 (file)
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -23,3 +23,8 @@ etc/xen/README
 # some of the code in the upstream init scripts.
 etc/xen/README.incompatibilities
 
+# When we build with ocaml support, do not try to ship development
+# libraries which we don't understand and are of limited use.
+# If someone wants this, suggestions from ocaml experts on what
+# to ship where would be welcome.
+usr/local/lib/ocaml

diff --git a/debian/rules b/debian/rules
index 09babb2133a0d60af209013953d9ae6c0be374cd..d6a626430eeefe95998ef0209d320d11e226560d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,6 @@ override_dh_auto_configure:
                --with-libexec-leaf-dir=xen-$(upstream_version) \
                --disable-blktap1 \
                --disable-blktap2 \
-               --disable-ocamltools \
                --disable-qemu-traditional --disable-rombios \
                --with-system-qemu=/usr/bin/qemu-system-i386 \
                --enable-ovmf --with-system-ovmf=/usr/share/ovmf/OVMF.fd \

diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install
index efd0fa25edb684da1a28928f3924ea35b5683b86..0f6cb8e3c2378722779c7bbd0ad0dabe659f2487 100644 (file)
--- a/debian/xen-utils-common.install
+++ b/debian/xen-utils-common.install
@@ -3,6 +3,7 @@ etc/xen/xl*
 etc/bash_completion.d/xl.sh    usr/share/bash-completion/completions/
 
 etc/default/xendomains
+etc/xen/oxenstored.conf
 
 usr/bin
 usr/sbin